Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 16 Sep 2011 04:48:59 +0000 (21:48 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 16 Sep 2011 04:48:59 +0000 (21:48 -0700)

Trivial merge